From 0b8215e0b1815ad729cb994e4f09247262009a8b Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Thu, 22 Mar 2018 20:58:31 +0000 Subject: [PATCH] Adwaita: Regenerate CSS from SASS https://gitlab.gnome.org/GNOME/gtk/merge_requests/66 introduced spurious red/green fore/background. Also, the GtkVideo stuff didn't get regenerated in. --- gtk/theme/Adwaita/gtk-contained-dark.css | 7 ++++++- gtk/theme/Adwaita/gtk-contained.css | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 64c1cf075d..cf26b39aa5 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -579,7 +579,7 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; } toolbar.vertical separator { margin: 6px 1px 7px 0; } -toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; color: red; background: green; } +toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; } .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; } @@ -1735,6 +1735,11 @@ paned.vertical > separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; background- paned.vertical > separator.wide { margin: 0; padding: 0; background-repeat: repeat-x, repeat-x; background-position: bottom, top; } +/************** GtkVideo * */ +video { background: black; } + +video image.osd { min-width: 64px; min-height: 64px; border-radius: 32px; } + /************** GtkInfoBar * */ infobar { border-style: none; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 99e29c7d31..97c2ef540b 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -587,7 +587,7 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; } toolbar.vertical separator { margin: 6px 1px 7px 0; } -toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; color: red; background: green; } +toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; } .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; } @@ -1755,6 +1755,11 @@ paned.vertical > separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; background- paned.vertical > separator.wide { margin: 0; padding: 0; background-repeat: repeat-x, repeat-x; background-position: bottom, top; } +/************** GtkVideo * */ +video { background: black; } + +video image.osd { min-width: 64px; min-height: 64px; border-radius: 32px; } + /************** GtkInfoBar * */ infobar { border-style: none; } -- 2.30.2